merge with xen-unstable.hg.
authorIsaku Yamahata <yamahata@valinux.co.jp>
Fri, 6 Mar 2009 03:22:22 +0000 (12:22 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Fri, 6 Mar 2009 03:22:22 +0000 (12:22 +0900)

Trivial merge